Skip to content

Conversation

@sourcegraph-release-bot
Copy link
Collaborator

Closes REL-1068

Problem

The release pipeline has been systematically failing in the promoteToPublic.finalize workflow with this error:

Warning: 1 uncommitted change
must be on a branch named differently than 'promote/release-v6.4.3889-update-main'

Root Cause

The final github:pr step in the promoteToPublic.finalize workflow was incorrectly trying to create a PR from the current branch to itself:

  • Current branch: promote/release-{{version}}-update-main
  • Target branch: promote/release-{{version}}-update-main ❌ (same branch!)
  • Should target: main

This happened because the variable internal_branch was set to the current branch name instead of the intended target branch.

Test plan

This will have to be tested on a release
Backport 1c06d26 from #699

…ug (#699)

Closes REL-1068

## Problem

The release pipeline has been systematically failing in the
`promoteToPublic.finalize` workflow with this error:
```
Warning: 1 uncommitted change
must be on a branch named differently than 'promote/release-v6.4.3889-update-main'
```

## Root Cause

The final `github:pr` step in the `promoteToPublic.finalize` workflow
was incorrectly trying to create a PR from the current branch to itself:

- **Current branch**: `promote/release-{{version}}-update-main`
- **Target branch**: `promote/release-{{version}}-update-main` ❌ (same
branch!)
- **Should target**: `main` ✅

This happened because the variable `internal_branch` was set to the
current branch name instead of the intended target branch.

### Test plan
This will have to be tested on a release

(cherry picked from commit 1c06d26)
@DaedalusG DaedalusG enabled auto-merge (squash) June 25, 2025 19:55
@DaedalusG DaedalusG merged commit dc638d7 into 6.5.x Jun 25, 2025
7 checks passed
@DaedalusG DaedalusG deleted the backport-699-to-6.5.x branch June 25, 2025 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants